From f15345d8a1d9ed2ab4ce853d3db5cfd8e6805198 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sat, 19 Jan 2019 09:56:16 +0100 Subject: [PATCH] d/rules,d/p/03: Fix DATADIC path, closes #913304 --- debian/patches/03_datadic_install.patch | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index acbcec13..f550c885 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -54,8 +54,8 @@ Author: Mathieu Malaterre -install(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) +set(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}") + -+install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) -+install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) ++install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${CMAKE_INSTALL_DATADIR} COMPONENT data) ++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIC} COMPONENT data) # add paths to the dictionaries to a CMake variable for being used by the unit tests set(DCMTK_DICOM_DICTIONARIES diff --git a/debian/rules b/debian/rules index 9452ba0c..5b999b3e 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_WITH_ICONV:BOOL=ON \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk14 \ + -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk14 \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DDCMTK_USE_CXX11_STL:BOOL=ON \ -DDCMTK_ENABLE_CXX11:BOOL=ON -- 2.30.2